Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 18:39:24 +0000 (11:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 18:39:24 +0000 (11:39 -0700)
commitefccdbc04b41affe3c568e82cf0f32618bd2a0a7
treeac791d9f2611a9d642ff6dd4cec9c0ddcbb7ea9c
parent02dad38561d7f5499f4ca64130bd1d4a66c98bf3
parent152bc19db6041207658442ebf1c225b7d14ae356
Merge from trunk.